From 3457856a781562bcc5ee3b8b1ab9ffa50ff03682 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 22 May 2024 16:18:58 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 551896 -> 552615 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index d9ce2736834..fdf4ea863c3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -926,7 +926,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index e86826815ef3ef465737a3340adcea31094eec22..77d59629c6e71a2291179a4ce056df5d394dd7ec 100644
GIT binary patch
delta 589
zcmca{U2*wc#fB}6&gFbu3P2E@l~|UTlAjzqIq<0H^u6+oJUr!@B^kO<;pw-F7^T=@
zoQyI?brvt6hUxdq7$v8#Eo0<@%k3*;l!41RO>1LRobHvuC<K>REMruY2U{7dqXV%T
zWKlfSY}?Az;@EbRaz-F#0%GRvCgm&{PJ*d<iAg!B@%bs)N(zd$3VHd{&u?YXntos>
zOOQBcW|~4tYH^8zk_xg>(<iQFl9?{Gi^X_)#zq#t>F>4yiPT*z64P%9GV@L|V`iD&
zwTne@dcztfmg#SHvv5q`yo*JA`Yw5Pnd$Yn7`dju*u^3>{k0v3!gSf)KnVjWcG2mM
zyIG8;-#QKC1}tFZn$9<aMS1#%D~ue|-%nxYn7)2Di|zD))j$@|JjLmMm{>Wc7xXX-
zLyTA0!=gF)u(8DSzRN%j|5viGO^@HhVm_U3H48_amt&Zti@&pHu)7zKvQ+|xgAzD+
zK(PY?X_;J{3aL58sa%|#3Z;3)sU-?fJwS1wBvcJp1&EEJWctQEEFua}!!@}O0fu7j
o^u|mUQ2}gv#ilRX!6r2Q!gLny_P={rfS47C*|z`P!+v`m0CGdg2mk;8

delta 248
zcmZ2}SMkPm#fB}6&gJb-Dj0#735c1uKdE4ebeeu^6^qLBJRuH_=?%MCyr%bDWaOCs
zcQ=di^wu3L64QP50Eyi@ScIlm?O~Cbp0I$0WqQCqAhBo<i}>_aHB2JY749%{O;^|f
z6nngfMQplv1UuLC3;Wmwr%UbyDskA!!av=8FN?wSx}7YZ({F%S2va2Xu}Dt;ox{pK
z-De+*;dJvHCV}a5_p#Vce*}`S{>9Ee-FH6=yQC(UqjP+4s8eu=hL>ZQql>?@XRx~$
gkeY6|iA`j>&Tba|_6z%2fS47C*|uNU&whO!0HtMLWB>pF

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0095619d50..eeb4afa2a51 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 8b8ee8ccaac..073f048998f 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2